Stop producing the emacs binary metapackage.

Move the emacs binary metapackage to its own source package
(emacs-defaults, cf. gcc-defaults).  This will prevent emacs23 and
emacs24 from producing the same binary package.

diff --git a/debian/control b/debian/control
index 80765368db1be65eee1a41d52523e05143ab8b41..d1fcf16de1a429e32373eda9f5239d38ef7e0534 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,15 +13,6 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
 Homepage: http://www.gnu.org/software/emacs/
 Standards-Version: 3.7.2
 
-Package: emacs
-Architecture: all
-Depends: emacs23 | emacs23-lucid | emacs23-nox, ${misc:Depends}
-Provides: emacsen, editor, mail-reader, news-reader
-Description: GNU Emacs editor (metapackage)
- GNU Emacs is the extensible self-documenting text editor.
- This is a metapackage which will always depend on the latest Emacs
- release.
-
 Package: emacs24-lucid
 Architecture: any
 Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/control.in b/debian/control.in
index 8eb0f8fb329b63c20d9ec5908acd0b961aae97c6..276d517734408ba573ff577232f1c9133e1add69 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,15 +13,6 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
 Homepage: http://www.gnu.org/software/emacs/
 Standards-Version: 3.7.2
 
-Package: emacs
-Architecture: all
-Depends: emacs23 | emacs23-lucid | emacs23-nox, ${misc:Depends}
-Provides: emacsen, editor, mail-reader, news-reader
-Description: GNU Emacs editor (metapackage)
- GNU Emacs is the extensible self-documenting text editor.
- This is a metapackage which will always depend on the latest Emacs
- release.
-
 Package: @DEB_FLAVOR@-lucid
 Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}